Skip to content

itstool: fix cross, fix python warnings#395150

Merged
uninsane merged 3 commits intoNixOS:stagingfrom
SFrijters:itstool-cross-staging
Apr 3, 2025
Merged

itstool: fix cross, fix python warnings#395150
uninsane merged 3 commits intoNixOS:stagingfrom
SFrijters:itstool-cross-staging

Conversation

@SFrijters
Copy link
Member

Attempting #341556 again.

Tested on native x86_64-linux, also cross-compiled to aarch64-linux and copied to a Raspberry Pi 4.
nix path-info -r ./result shows only aarch64 in the closure when cross-compiling.

Things done

  • Built on platform(s)
    • x86_64-linux + cross to aarch64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@SFrijters SFrijters requested a review from Artturin April 1, 2025 11:25
@ofborg ofborg bot added the 6.topic: cross-compilation Building packages on a different platform than they will be used on label Apr 1, 2025
@github-actions github-actions bot added 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. labels Apr 1, 2025
@SFrijters SFrijters requested a review from bjornfor April 1, 2025 11:34
@SFrijters SFrijters force-pushed the itstool-cross-staging branch from dadb2ba to f0a2fe5 Compare April 1, 2025 14:04
Copy link
Contributor

@bjornfor bjornfor left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one person. label Apr 2, 2025
@uninsane uninsane merged commit c458e2b into NixOS:staging Apr 3, 2025
27 of 28 checks passed
@SFrijters SFrijters deleted the itstool-cross-staging branch April 3, 2025 22:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: cross-compilation Building packages on a different platform than they will be used on 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 12.approvals: 1 This PR was reviewed and approved by one person.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants